From de73f4ddcadf7bbf031b848859af6496b9bc0db0 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Mon, 3 Sep 2007 14:58:35 +0100 Subject: [PATCH] Fix 64 bit build, cannot mix code and data declarations. Signed-off-by: Ian Campbell --- xen/arch/x86/platform_hypercall.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/xen/arch/x86/platform_hypercall.c b/xen/arch/x86/platform_hypercall.c index 6228ea9671..24568db224 100644 --- a/xen/arch/x86/platform_hypercall.c +++ b/xen/arch/x86/platform_hypercall.c @@ -137,6 +137,9 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) case XENPF_microcode_update: { extern int microcode_update(XEN_GUEST_HANDLE(void), unsigned long len); +#ifdef COMPAT + XEN_GUEST_HANDLE(void) data; +#endif ret = xsm_microcode(); if ( ret ) @@ -146,8 +149,6 @@ ret_t do_platform_op(XEN_GUEST_HANDLE(xen_platform_op_t) u_xenpf_op) ret = microcode_update(op->u.microcode.data, op->u.microcode.length); #else - XEN_GUEST_HANDLE(void) data; - guest_from_compat_handle(data, op->u.microcode.data); ret = microcode_update(data, op->u.microcode.length); #endif -- 2.30.2